Revision: bazaar--devel--1.1--patch-44
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Wed Dec 15 21:52:23 EST 2004
Standard-date: 2004-12-15 10:52:23 GMT
New-files: libarch/arch-cache.c libarch/arch-cache.h
    libarch/cached-archive.c libarch/cached-archive.h
    libarch/tests/.arch-ids/unit-pfs.c.id
    libarch/tests/unit-pfs.c
Modified-files: baz/baz.c commands/branch.c
    commands/commit.c commands/make-archive.c
    commands/my-revision-library.c
    commands/register-archive.c commands/undo.c
    libarch/archive.c libarch/archive.h libarch/commit.c
    libarch/inv-ids.c libarch/inv-ids.h libarch/my.c
    libarch/my.h libarch/pfs.c libarch/pfs.h
    libarch/tests/unit-inv-ids.c
    tests/test-archive-creation.sh
    tests/test-archive-setup.sh tests/test-commit.sh
    tests/test-framework tests/test-get.sh
    tests/test-import-baz.sh tests/test-import.sh
    tests/test-mirror.sh tests/test-register-archive.sh
    tests/test-rm-explicit.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--cached--0--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--cached--0--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--base-0
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-2
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-3
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-4
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-5
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-6
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-7
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-8
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-9
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-10
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-11
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-12
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-13
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-14
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-15
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-16
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-17
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-18
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-19
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-20
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-21
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-22
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-23
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-24
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-25
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-26
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-27
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-28
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-29
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--base-0
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--patch-2
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-9
    eric@petta-tech.com--2004b-ordinary/tlasrc--normalperson--0.2--patch-2
    jblack@gnuarch.org--2004/baz--help--1.1--base-0
    jblack@gnuarch.org--2004/baz--help--1.1--patch-1
    jblack@gnuarch.org--2004/bazaar--lint--1.1--base-0
    rob.weir@canonical.com--2004-public/baz--bug3376--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-4
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-5
    rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-6
    rob.weir@canonical.com--2004-public/baz--bug3610--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug3610--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug3610--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4488--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4488--0--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-44
    thelove@canonical.com/bazaar--devo--1.1--patch-38
    thelove@canonical.com/bazaar--devo--1.1--patch-39
    thelove@canonical.com/bazaar--devo--1.1--patch-40
    thelove@canonical.com/bazaar--devo--1.1--patch-41
    thelove@canonical.com/bazaar--devo--1.1--patch-42
    thelove@canonical.com/bazaar--devo--1.1--patch-43
    thelove@canonical.com/bazaar--devo--1.1--patch-44
    thelove@canonical.com/bazaar--devo--1.1--patch-45
    thelove@canonical.com/bazaar--devo--1.1--patch-46
    thelove@canonical.com/bazaar--devo--1.1--patch-47
    thelove@canonical.com/bazaar--devo--1.1--patch-48
    thelove@canonical.com/bazaar--devo--1.1--patch-49
    thelove@canonical.com/bazaar--devo--1.1--patch-50
    thelove@canonical.com/bazaar--devo--1.1--patch-51
    thelove@canonical.com/bazaar--devo--1.1--patch-52
    thelove@canonical.com/bazaar--devo--1.1--patch-53
    thelove@canonical.com/bazaar--devo--1.1--patch-54
    thelove@canonical.com/bazaar--devo--1.1--patch-55
Summary: merge from thelove@canonical.com/bazaar--devo--1.1
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--0--base-0
   tag of aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--patch-2

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--0--patch-1
   Removed commit --base support

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--0--patch-2
   Merged the latest from baz--devo--1.1

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-49

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-1
   Merge archive caching from bazaar--cached--0

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-2
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-3
   Changed function to explicitly void.  Sheesh.

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-4
   used arch_abs_path where appropriate, fixed pfs_abs_path for caches

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-54

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--0--patch-1
   defined anything with : before / as a non-local path

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--base-0
   tag of aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-8

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-1
   Removed log template

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-2
   Merge (tlasrc--devel--0.2, James Blackwell, MLH)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-3
   Initial passthrough archive connect code

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-4
   Got passthrough working, at least for a simple case

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-5
   Fixed include guard

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-6
   Added basic archive cache implementation

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-7
   Bugfixen for the Arch Cache

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-8
   Started using the arch cache for get-patch

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-9
   Added support for caching full trees (on read)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-10
   Added get_str and put_str methods for the archive cache

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-11
   Added log caching

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-12
   Made cache put require a commit, so aborts don't produce cache garbage

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-13
   Removed hard-coded cache location

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-14
   Added copyright statements to new source files

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-15
   updated tests to use cached archives always.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-16
   Updated tests to support cache better

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-17
   Updated cached archive to support creating archives over cache

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-18
   Made test-framework delete the cache when initializing

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-19
   Adjusted test framework to delete cache after test

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-20
   Fixed order of declaration, changed direct pfs use to archives.h iface

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-21
   Added support for line read/write

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-22
   store rev type, use full-trees as cacherevs, missing from the source

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-23
   Cached and used archive type.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-24
   Added ancestor caching, for continuations

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-25
   Cache changesets at commit time

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-26
   Added ancestor caching on commit

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-27
   Removed unused variable

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-28
   Fixed memory handling in arch_cache_get_str

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--0--patch-29
   fix a file descriptor leak when opening logs (Eric Wong)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--base-0
   tag of aaron.bentley@utoronto.ca--tla-2004/tlasrc--commit-base--3--patch-1

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--patch-1
   Fixed includes

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--cache--1--patch-2
   fix a file descriptor leak when opening logs (Eric Wong)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-9
   Merge (James Blackwell, MLH)

 * eric@petta-tech.com--2004b-ordinary/tlasrc--normalperson--0.2--patch-2
   fix a file descriptor leak when opening logs

 * jblack@gnuarch.org--2004/baz--help--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-50

 * jblack@gnuarch.org--2004/baz--help--1.1--patch-1
   Fixing up --help to print long help

 * jblack@gnuarch.org--2004/bazaar--lint--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-50

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-33

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-1
   sync with thelove.

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-2
   Rename abs_path to arch_pfs_abs_path, and move to pfs.c

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-3
   Add another test for arch_pfs_abs_path.

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-4
   Fix and test #3376.

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-5
   oops

 * rob.weir@canonical.com--2004-public/baz--bug3376--0--patch-6
   Allocate memory properly, oops.

 * rob.weir@canonical.com--2004-public/baz--bug3610--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-50

 * rob.weir@canonical.com--2004-public/baz--bug3610--0--patch-1
   Absolutise local paths in make-archive.

 * rob.weir@canonical.com--2004-public/baz--bug3610--0--patch-2
   Add test from Matt.

 * rob.weir@canonical.com--2004-public/baz--bug4488--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-33

 * rob.weir@canonical.com--2004-public/baz--bug4488--0--patch-1
   Add note about importing.

 * thelove@canonical.com/bazaar--devo--1.1--patch-38
   rename all cmd-* files to *, reducing path info duplication

 * thelove@canonical.com/bazaar--devo--1.1--patch-39
   reimplement a changes command for local tree changes, replacing the temporary problems command bug #4293

 * thelove@canonical.com/bazaar--devo--1.1--patch-40
   replace diff --nodiffs with diff --summary. Bug #4293

 * thelove@canonical.com/bazaar--devo--1.1--patch-41
   correct accidental creation of {arch} directories on branching

 * thelove@canonical.com/bazaar--devo--1.1--patch-42
   make --three-way the default for star merge, and fix thus uncovered bugs.

 * thelove@canonical.com/bazaar--devo--1.1--patch-43
   check for old reject file path too

 * thelove@canonical.com/bazaar--devo--1.1--patch-44
   changes->status, and lint output after diffs

 * thelove@canonical.com/bazaar--devo--1.1--patch-45
   implement status --lint

 * thelove@canonical.com/bazaar--devo--1.1--patch-46
   teach help to only show aliases upon request

 * thelove@canonical.com/bazaar--devo--1.1--patch-47
   make star-merge -t a deprecated error-on-use option

 * thelove@canonical.com/bazaar--devo--1.1--patch-48
   merge conflict detection fix from robert.collins@canonical.com--general/bazaar--merge--1.1

 * thelove@canonical.com/bazaar--devo--1.1--patch-49
   Fix #4488.

 * thelove@canonical.com/bazaar--devo--1.1--patch-50
   Merge in bug fix for #3376.

 * thelove@canonical.com/bazaar--devo--1.1--patch-51
   Heres a thought. long help(--help) gives long help (fixes #4482)

 * thelove@canonical.com/bazaar--devo--1.1--patch-52
   Fixing up undo so that the tree is no longer in reject state

 * thelove@canonical.com/bazaar--devo--1.1--patch-53
   Absolutise archive locations in make-archive, fixing bug #3610.

 * thelove@canonical.com/bazaar--devo--1.1--patch-54
   Added Arch Cache support

 * thelove@canonical.com/bazaar--devo--1.1--patch-55
   Consider all paths with ':' before '/' to be non-local

